From: Dan Nicolaescu Date: Mon, 28 Dec 2009 18:34:51 +0000 (-0800) Subject: (vc-bzr-log-view-mode): Fix short log regexp. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8839 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=82119ca97529517b1ced67c1d3892621ea70fee4;p=emacs.git (vc-bzr-log-view-mode): Fix short log regexp. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63f192cdfa9..0cd248e7c69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-12-28 Dan Nicolaescu + + * vc-bzr.el (vc-bzr-log-view-mode): Fix short log regexp. + 2009-12-28 Juanma Barranquero Supersede color.diff settings in git log (bug#5211). diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index ae6117d1891..99b910e9f94 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -462,7 +462,7 @@ REV non-nil gets an error." (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) (if vc-short-log - "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" + "^ *\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local